Search
Git: Switching Unstaged Changes to a New Branch
28.1.2022
I’m always on the wrong branch. I’m either on master or main working on something that should be on a fix or feature branch. Or I’m on the last branch I was working on and should have cut a new …
Git: Switching Unstaged Changes to a New Branch originally published...
Using the Reflog to Restore Lost Commits
30.11.2021
This article is part of our “Advanced Git” series. Be sure to follow us on Twitter or sign up for our newsletter to hear about future articles!
The “Reflog” is one of Git’s lesser-known features—but one that can be extremely …
The post Using the Reflog to Restore Lost Commits appeared first...
Cherry-Picking Commits in Git
17.11.2021
In part 5 of this series, we looked at rebasing and merging. Although there are a couple of differences between git merge and git rebase, both commands have the same goal: they integrate changes from one branch into another.
The post Cherry-Picking Commits in Git appeared first on CSS-Tricks....
Merge Conflicts: What They Are and How to Deal with Them
28.10.2021
Merge conflicts... Nobody likes them. Some of us even fear them. But they are a fact of life when you're working with Git, especially when you're teaming up with other developers. In most cases, merge conflicts aren't as scary as you might think. In this fourth part of our “Advanced Git” series...
Better Collaboration With Pull Requests
11.10.2021
This article is part of our “Advanced Git” series. Be sure to follow us on Twitter or sign up for our newsletter to hear about the next articles!
In this third installment of our “Advanced Git” series, we’ll look at …
The post Better Collaboration With Pull Requests appeared first...
Branching Strategies in Git
5.10.2021
In this article I'm going to talk about branching strategies and different types of Git branches. I’m also going to introduce you to two common branching workflows: Git Flow and GitHub Flow.
The post Branching Strategies in Git appeared first on CSS-Tricks. You can support CSS-Tricks by being...
Creating the Perfect Commit in Git
30.9.2021
A commit can be something that helps us stay on top of things. It can be a container for related changes that belong to one and only one topic, and thereby make it easier for us to understand what happened.
In this post, we’re talking about what it takes to produce the "perfect" commit.
The post...
CMD+Z for Git is Here
23.7.2020
Version control with Git has become a “commodity” by now: virtually every software project today uses Git, and virtually every developer knows Git to some extent. This explains why I sometimes hear the following question when I talk about what I do for a living: “A desktop client...
The Smart Ways to Correct Mistakes in Git
14.2.2019
The world of software development offers an infinite amount of ways to mess up: deleting the wrong things, coding into dead ends, littering commit messages with typos, are a mere few of the plentitude.
Fortunately, however, we have a wonderful safety net under our feet in the form of Git when...